Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 09:38:32 +0000 (02:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 09:38:32 +0000 (02:38 -0700)
commit55c6cab866e5ce1aba9268493c970e2d200b2617
treecc78e67afd1c401acdcccfc9f57bf67ef7807d7b
parent7de79c83edb71c2a2d1c3538d54a46a01d7fbd7c
parent25bf934c38875be831ceac2e77053b46af919830
Merge from trunk.
ChangeLog
src/ChangeLog